Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

• Open a pull request for review
• Mark a draft as ready
• Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/net_processing.cpp (1)

3542-3545: ⚡ Quick win

Use a strong result type for DSTX validation scores.

The scoring logic looks correct, but std::pair<int, bool> keeps this security-sensitive contract positional; old-style returns like {false, true} would still compile as a zero-penalty early return. A small named result type makes future edits safer.

Suggested refactor

-// Returned score is the misbehavior penalty to apply to the relaying peer; 0 means no penalty.
-// do_return signals the caller to stop further processing of the DSTX.
-std::pair<int /*misbehavior_score*/, bool /*do_return*/> static ValidateDSTX(CDeterministicMNManager& dmnman, CDSTXManager& dstxman, ChainstateManager& chainman,
-                                                                             CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool, CCoinJoinBroadcastTx& dstx, uint256 hashTx)
+enum class DSTXMisbehaviorScore : int {
+    NONE = 0,
+    UNKNOWN_MASTERNODE = 1,
+    INVALID = 10,
+};
+
+struct DSTXValidationResult {
+    DSTXMisbehaviorScore misbehavior_score{DSTXMisbehaviorScore::NONE};
+    bool do_return{false};
+};
+
+static DSTXValidationResult ValidateDSTX(CDeterministicMNManager& dmnman, CDSTXManager& dstxman, ChainstateManager& chainman,
+                                         CMasternodeMetaMan& mn_metaman, CTxMemPool& mempool, CCoinJoinBroadcastTx& dstx, uint256 hashTx)
@@
-        return {10, true};
+        return {DSTXMisbehaviorScore::INVALID, true};
@@
-        return {0, true}; // not an error
+        return {DSTXMisbehaviorScore::NONE, true}; // not an error
@@
-        return {1, true};
+        return {DSTXMisbehaviorScore::UNKNOWN_MASTERNODE, true};
@@
-        return {0, true};
+        return {DSTXMisbehaviorScore::NONE, true};
@@
-        return {10, true};
+        return {DSTXMisbehaviorScore::INVALID, true};
@@
-    return {0, false};
+    return {DSTXMisbehaviorScore::NONE, false};
@@
-            const auto& [misbehavior_score, bDoReturn] = ValidateDSTX(*m_dmnman, m_dstxman, m_chainman, m_mn_metaman, m_mempool, dstx, hashTx);
-            if (bDoReturn) {
-                if (misbehavior_score > 0) {
-                    Misbehaving(pfrom.GetId(), misbehavior_score, "invalid dstx");
+            const auto dstx_validation = ValidateDSTX(*m_dmnman, m_dstxman, m_chainman, m_mn_metaman, m_mempool, dstx, hashTx);
+            if (dstx_validation.do_return) {
+                if (dstx_validation.misbehavior_score != DSTXMisbehaviorScore::NONE) {
+                    Misbehaving(pfrom.GetId(), static_cast<int>(dstx_validation.misbehavior_score), "invalid dstx");
                 }
                 return;
             }

Also applies to: 3551-3555, 3588-3591, 3594-3604, 3610-3610, 4675-4679

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/net_processing.cpp` around lines 3542 - 3545, Replace the std::pair<int,
bool> return type with a named result type (such as a struct with clearly named
fields like misbehavior_score and do_return) to make the security-sensitive DSTX
validation contract explicit and type-safe. Update the ValidateDSTX function
signature at line 3542-3545 to use this new named type, then update all return
statements within ValidateDSTX (around lines 3551-3555, 3588-3591, 3594-3604,
3610-3610) to construct instances of the new type using named initialization
instead of positional pair construction. Finally, update all call sites of
ValidateDSTX (around line 4675-4679) to use named field access instead of .first
and .second accessors.